Move GtkMenuBar docs inline

And remove some outdated content.

diff --git a/docs/reference/gtk/tmpl/.gitignore b/docs/reference/gtk/tmpl/.gitignore
index 1249f4db134806ce9da5dfac5dc88011fb379d5e..ebc9d6b070f2cd84b066dedc6b11ad373c4060d9 100644 (file)
--- a/docs/reference/gtk/tmpl/.gitignore
+++ b/docs/reference/gtk/tmpl/.gitignore
@@ -34,6 +34,7 @@ gtkitemfactory.sgml
 gtklayout.sgml
 gtklinkbutton.sgml
 gtkmain.sgml
+gtkmenubar.sgml
 gtkmessagedialog.sgml
 gtknotebook.sgml
 gtkobject.sgml

diff --git a/docs/reference/gtk/tmpl/gtkmenubar.sgml b/docs/reference/gtk/tmpl/gtkmenubar.sgml
deleted file mode 100644 (file)
index 8950463..0000000
--- a/docs/reference/gtk/tmpl/gtkmenubar.sgml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-GtkMenuBar
-
-<!-- ##### SECTION Short_Description ##### -->
-A subclass widget for GtkMenuShell which holds GtkMenuItem widgets
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-The #GtkMenuBar is a subclass of #GtkMenuShell which contains one to many #GtkMenuItem. The result is a standard menu bar which can hold many menu items. #GtkMenuBar allows for a shadow type to be set for aesthetic purposes. The shadow types are defined in the #gtk_menu_bar_set_shadow_type function.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-#GtkMenuShell, #GtkMenu, #GtkMenuItem
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### SECTION Image ##### -->
-
-
-<!-- ##### STRUCT GtkMenuBar ##### -->
-<para>
-The #GtkMenuBar struct contains the following fields. (These fields should be considered read-only.  They should never be set by an application.)
-</para>
-
-
-<!-- ##### ARG GtkMenuBar:child-pack-direction ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenuBar:pack-direction ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenuBar:internal-padding ##### -->
-<para>
-
-</para>
-
-<!-- ##### ARG GtkMenuBar:shadow-type ##### -->
-<para>
-
-</para>
-
-<!-- ##### FUNCTION gtk_menu_bar_new ##### -->
-<para>
-Creates the new #GtkMenuBar
-</para>
-
-@void: 
-@Returns: the #GtkMenuBar
-
-
-<!-- ##### ENUM GtkPackDirection ##### -->
-<para>
-Determines how widgets should be packed insided menubars and 
-menuitems contained in menubars.
-</para>
-
-@GTK_PACK_DIRECTION_LTR: Widgets are packed left-to-right.
-@GTK_PACK_DIRECTION_RTL: Widgets are packed right-to-left.
-@GTK_PACK_DIRECTION_TTB: Widgets are packed top-to-bottom.
-@GTK_PACK_DIRECTION_BTT: Widgets are packed bottom-to-top.
-
-<!-- ##### FUNCTION gtk_menu_bar_set_pack_direction ##### -->
-<para>
-
-</para>
-
-@menubar: 
-@pack_dir: 
-
-
-<!-- ##### FUNCTION gtk_menu_bar_get_pack_direction ##### -->
-<para>
-
-</para>
-
-@menubar: 
-@Returns: 
-
-
-<!-- ##### FUNCTION gtk_menu_bar_set_child_pack_direction ##### -->
-<para>
-
-</para>
-
-@menubar: 
-@child_pack_dir: 
-
-
-<!-- ##### FUNCTION gtk_menu_bar_get_child_pack_direction ##### -->
-<para>
-
-</para>
-
-@menubar: 
-@Returns: 
-
-

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index d146359c97e259670e59fe4e769da435b747f9ee..76ea88578f08f0e2cbae6d444cb1f5ccceaffee6 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -648,6 +648,16 @@ typedef enum
   GTK_IM_STATUS_NONE
 } GtkIMStatusStyle;
 
+/**
+ * GtkPackDirection:
+ * @GTK_PACK_DIRECTION_LTR: Widgets are packed left-to-right
+ * @GTK_PACK_DIRECTION_RTL: Widgets are packed right-to-left
+ * @GTK_PACK_DIRECTION_TTB: Widgets are packed top-to-bottom
+ * @GTK_PACK_DIRECTION_BTT: Widgets are packed bottom-to-top
+ *
+ * Determines how widgets should be packed insided menubars
+ * and menuitems contained in menubars.
+ */
 typedef enum
 {
   GTK_PACK_DIRECTION_LTR,

diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index 42f2f25819a8b190f568be547ed29b04f56f1227..b35ec0ca89a096e470ade725100e4f70042b92a6 100644 (file)
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -24,6 +24,17 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
  */
 
+/**
+ * SECTION:gtkmenubar
+ * @Title: GtkMenuBar
+ * @Short_description: A subclass of GtkMenuShell which holds GtkMenuItem widgets
+ * @See_also: #GtkMenuShell, #GtkMenu, #GtkMenuItem
+ *
+ * The #GtkMenuBar is a subclass of #GtkMenuShell which contains one or
+ * more #GtkMenuItems. The result is a standard menu bar which can hold
+ * many menu items.
+ */
+
 #include "config.h"
 
 #include "gtkmenubar.h"
@@ -224,6 +235,13 @@ gtk_menu_bar_init (GtkMenuBar *menu_bar)
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_MENUBAR);
 }
 
+/**
+ * gtk_menu_bar_new:
+ *
+ * Creates a new #GtkMenuBar
+ *
+ * Returns: the new menu bar, as a #GtkWidget
+ */
 GtkWidget*
 gtk_menu_bar_new (void)
 {